From 7443d886d6f7d0db707863cf4077ed239c3ab411 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 8 Aug 2020 13:41:10 +0100 Subject: [PATCH] Add patches from upstream for some tests/warnings fixes --- ...-a-warning-if-we-can-t-talk-to-avahi.patch | 26 +++++++++++++++++++ ...stalled-tests-Fix-the-icontheme-test.patch | 24 +++++++++++++++++ debian/patches/series | 3 +++ .../testsuite-Fix-installed-tests.patch | 26 +++++++++++++++++++ 4 files changed, 79 insertions(+) create mode 100644 debian/patches/cups-Don-t-emit-a-warning-if-we-can-t-talk-to-avahi.patch create mode 100644 debian/patches/installed-tests-Fix-the-icontheme-test.patch create mode 100644 debian/patches/series create mode 100644 debian/patches/testsuite-Fix-installed-tests.patch diff --git a/debian/patches/cups-Don-t-emit-a-warning-if-we-can-t-talk-to-avahi.patch b/debian/patches/cups-Don-t-emit-a-warning-if-we-can-t-talk-to-avahi.patch new file mode 100644 index 0000000000..a110a09944 --- /dev/null +++ b/debian/patches/cups-Don-t-emit-a-warning-if-we-can-t-talk-to-avahi.patch @@ -0,0 +1,26 @@ +From: Matthias Clasen +Date: Sat, 1 Aug 2020 22:42:25 -0400 +Subject: cups: Don't emit a warning if we can't talk to avahi + +The g_warning in this case makes the templates test +fail if it can't connect to the system bus (as is the +case for running installed tests in ci). + +Origin: upstream, 3.99.1 +--- + modules/printbackends/gtkprintbackendcups.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/printbackends/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c +index 6453e82..5ca8049 100644 +--- a/modules/printbackends/gtkprintbackendcups.c ++++ b/modules/printbackends/gtkprintbackendcups.c +@@ -3413,7 +3413,7 @@ avahi_create_browsers (GObject *source_object, + if (!dbus_connection) + { + if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) +- g_warning ("Couldn't connect to D-Bus system bus, %s", error->message); ++ g_message ("Couldn't connect to D-Bus system bus, avahi printers will not be available: %s", error->message); + + g_error_free (error); + return; diff --git a/debian/patches/installed-tests-Fix-the-icontheme-test.patch b/debian/patches/installed-tests-Fix-the-icontheme-test.patch new file mode 100644 index 0000000000..daf6f4e4b9 --- /dev/null +++ b/debian/patches/installed-tests-Fix-the-icontheme-test.patch @@ -0,0 +1,24 @@ +From: Matthias Clasen +Date: Sat, 1 Aug 2020 22:30:06 -0400 +Subject: installed-tests: Fix the icontheme test + +We forgot to install some of the icons, causing +the test to fail. + +Origin: upstream, 3.99.1 +--- + testsuite/gtk/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build +index 286c8f3..929d9ca 100644 +--- a/testsuite/gtk/meson.build ++++ b/testsuite/gtk/meson.build +@@ -271,6 +271,7 @@ if get_option('install-tests') + endforeach + + install_subdir('icons', install_dir: testexecdir) ++ install_subdir('icons2', install_dir: testexecdir) + install_subdir('ui', install_dir: testexecdir) + + endif diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000000..ae5f56c7d7 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +testsuite-Fix-installed-tests.patch +installed-tests-Fix-the-icontheme-test.patch +cups-Don-t-emit-a-warning-if-we-can-t-talk-to-avahi.patch diff --git a/debian/patches/testsuite-Fix-installed-tests.patch b/debian/patches/testsuite-Fix-installed-tests.patch new file mode 100644 index 0000000000..d8973c9c2a --- /dev/null +++ b/debian/patches/testsuite-Fix-installed-tests.patch @@ -0,0 +1,26 @@ +From: Matthias Clasen +Date: Sat, 1 Aug 2020 21:23:34 -0400 +Subject: testsuite: Fix installed tests + +This broken recently, when we converted the tests +array to a dictionary. + +Fixes: #2966 +Origin: upstream, 3.99.1 +--- + testsuite/gtk/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build +index 1238882..286c8f3 100644 +--- a/testsuite/gtk/meson.build ++++ b/testsuite/gtk/meson.build +@@ -260,7 +260,7 @@ endforeach + + if get_option('install-tests') + foreach t : tests +- test_name = t.get(0) ++ test_name = t.get('name') + conf = configuration_data() + conf.set('testexecdir', testexecdir) + conf.set('test', test_name) -- 2.30.2